Add zero fill strategy
Merge branch 'zerofill' into next