Merge branch 'hotfix/padding_text_vie'
Merge branch 'master' into develop