AUI-1160 Source formatting
AUI-1160 Regenerate