Merge "Refactor caller identity checks"