#20269 total remake modals resize
Merge branch 'master' into development