Epp 5.2 changes