Merge branch 'ta/pretty-parse-config' into next