Merge branch 'hotfix/2.6' into 'master'

hotfix/2.6 into master

See merge request !440
2 jobs for 2.6
latest
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