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

hotfix/2.6.1 into Support/2.6.X

See merge request !448
2 jobs for Support/2.6.X