Merge branch 'hotfix/2.6.2' into 'master'

Hotfix/2.6.2

See merge request !454
2 jobs for 2.6.2
latest
Status Name Job ID Coverage
  Build
failed build #20803

 
  Tests
skipped tests #20804
 
Name Stage Failure
failed
build Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log