Merge remote-tracking branch 'origin/i22965'
Merge branch 'master' into i23330
#23330 Fixed bug with layout.
Merge branch 'i23330' into development