AUI-754 + build files