Blocks edit

RH-57957 is fixed in the latest WIP