Corrected some descriptions and sorted out!
Merge remote-tracking branch 'upstream/master'
Just a little changes to avoid to update always hotplug_enable parameter!