Font change caused some misalignment
Merge branch 'hotfix-2.3.19'