AUI-1055 Source Formatting