AUI-631 + build files (required for AUI-678)
AUI-615 + build files (required for AUI-678)
AUI-678 + build files