AUI-1541 + build files
SDH AUI-1617 + build files