Merge bugfix
into dev
for release 2.27.0
#8772
Merged
bugfix
into dev
for release 2.27.0
#8772