Merge branch 'bugfix-12294' into release-6.6.2
Merge branch 'release-6.6.2' into develop