Update Control Panel mouse-hover
Merge remote-tracking branch 'upstream/master'
Update Control Panel mouse-hover