Start with naive implementation of include with block
Merge remote-tracking branch 'upstream/master'