Merge "Fix issues with installing sdist and wheels"