Blocks ---- issues

RH-51428 is fixed in Rhino WIP