Merge branch 'doc-types' into 'master'