Merge "Ensure the calling identity is restored" into main