Merge "fix docker start error"