* commit '64d6bacf13e4ae913c52b773439a542dc5b2b714': DO NOT MERGE Restore calling identity before checking permission