Update input padding to use superblocks.
Merge branch 'master' into cj-mc1