Macro for ReplaceBlock

RH-72651 is fixed in the latest WIP