[AUI-1613]