Merged changes to ascentis_mvc