padding fix
Merge branch 'core'