Merge branch 'as/log-output-encoding-in-user-format'