Merge branch 'jk/graph-padding-fix'