[[ Bug 10979 ]] Fixed compile error.
Merge branch 'bugfix-10979' into release-6.1.1