Merge pull request #11024 from projectcalico/copilot/fix-5babeaca-1b3d-4dad-bb1d-c09fc034f7b7