Merge branch 'master' of plugins/typeMigration