AUI-944 Build