AUI-1151 Source formatting
Merge branch 'pr-484'