Merge "Rewrite managing of virtualenvs"