Merge branch 'mrf/simple_policy/check_actor' into 'develop'