Merge branch 'feature/1792-update-actor-type' into 'develop'