Merge "Refactored actor impl child/parent handling out" into devel/master