AUI-1471 - Source formatting