Merge pull request #4592 from koying/fixlinhotplug