updated version from rz/block-bundle