Fix for rename BaseControl to Control
Merge origin/master