Aw/update alz april and enforcementMode changes (#1273)