AUI-1617 - Source formatting
AUI-1617 - Build