Make block and extract syntax additive by default
Merge branch 'additive_blocks'

* additive_blocks:
  Make block and extract syntax additive by default