[ESCALATION] AUI-970

For AUI 1.5.x