ref: refs/heads/copilot/fix-7801