2.07.2:zeress:10 Merged in some RoI events