Merge branch 'MVC-1.0' into BeforeMerge'