Resolved a problem mapping tenant id and org actorId
Merge with master