AUI-975 1.5.x BackPort
AUI-975 - Source formatting backport
AUI-975 - Source formatting
AUI-975 - Build