Merge bugfix
-> dev
for release 2.42.0
#11511
Merged
bugfix
-> dev
for release 2.42.0
#11511