AUI-1321 - Source formatting