Merge branch 'mk/maint-parse-careful'