fix merge conflicts after updating issue branch from master

Status Job ID Name Coverage
  Build
failed #4995
build

 
  Deploy
skipped #4996
allowed to fail manual
deploy_production
 
Name Stage Failure
failed
build Build There is an unknown failure, please try again
No job trace