AUI-1386 - build