Merge branch 'Support/2.6.X' into 'master'

Support/2.6.x

See merge request !467
2 jobs for 2.6.3
latest
Status Name Job ID Coverage
  Build
failed build #22398

 
  Tests
skipped tests #22399
 
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