AUI-905 1.5.x Backport
AUI-905 - Source Formatting
AUI-905 - Build