Merge "Handle proxy chains including the system package" into sc-dev