Modify MBA2012 only settings
Revert MBA2012 only settings
Modify settings
Merge branch 'mba2012'