Edit Blend Surface

RH-53677 is fixed in the latest WIP