Merge "Workaround issue with pip overlay not hiding cleanly." into oc-dev