Changes for epolicy R6