Merge branch 'jk/type-from-string-gently' into maint