base Shaper has 5 blocks
Merge remote-tracking branch 'upstream/shape' into shape