WIP (8) feedback

RH-73328 is fixed in the latest WIP