2.07.2:zeress:3 RoI Compatch Part 2

- common folder done
- Still CTDs