Fixing remote block
Merge branch '7.0' of github.com:bldr-io/bldr into 7.0

* '7.0' of github.com:bldr-io/bldr: