AUI-1133 + build files