FIX #20561 TIME 0:10 fix 3 conflicts of branch '21.03' into 'feat/20561/21.03'

# Conflicts:
#   src/frontend/app/process/process.component.scss
#   src/lang/lang-en.json
#   src/lang/lang-fr.json