Virtual general controller
Merge master