2.07.2:zeress:2 RoI Compatch Part 1

- Still CTDs