AUI-690 + build files
AUI-683 + build files