2.07.2:schwarherz:4 RoI Compatch conversion

Conversion decisions compatched