Resolving Git Merge Conflicts After Cherry-Pick - Fix Docker Build Canceled During Context Upload-Fix 'Python' Is Not Recognized on Windows 7

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.