Merge "Fix enter pip parameters" into sc-dev