Merge "Refactor ensurePip call to be more explicit" into main