Fixed identity issues (they seemed to have reverted)
Revert "Fixed identity issues (they seemed to have reverted)"

This reverts commit 3fea5f92b51177dce523d8c325af098cc0412366.
Added back Identity files that have disappeared 2x
Merge branch 'develop'