Remove Identity type
Merge branch 'master' into remove-identity
Merge branch 'master' into remove-identity
Merge branch 'remove-identity'