Block edit and non-uniform scale

RH-57957 is fixed in the latest WIP