Change vertical-centering approach. Fixes BRBPL-3931.
Merge branch 'hotfix/0.3.7'