modify MVC
Merge branch 'mvc' into dev