AUI-723 + build files
AUI-757 + build files