Merge "Modify docker shell"