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

hotfix/2.6 into Support/2.6.X

See merge request !441
2 jobs for hotfix/2.6.1