#25035 fixes
#25035
Merge branch 'master' into development