Fix padding bug
Merge branch 'master' into Release
Merge master