Combined parts of Actor and Isoentity
Merge branch 'Actor' into Develop