Merge "Use credential owner user id for identity check" into main