Subtraction component changes tree structure

RH-45811 is fixed in the latest Service Release Candidate