Merge branch 'hotfix/1.1.1'
Handle padding well
Merge branch 'hotfix/1.1.2' into develop