Merge branch 'master' into identities-3d