Merge "Isolate shell dependencies"