Merge branch 'hotfix/hotfix'
Text align fix
Merge branch 'hotfix/hotfix' into develop