Merge remote-tracking branch 'origin/develop'
padding text vie
Merge branch 'hotfix/padding_text_vie' into develop