Actor properties consistency improved
Merge pull request #6927 from huwpascoe/actor-fixup

Actor properties consistency improved