#18958 fixes. Removed option of moving text fields to the bottom
Merge branch 'master' into i18958
Minor
Merge branch 'i18958'