AUI-1201 - Updating Build