AUI-1044 - Build