Importing lessons learned from the MVC5 branch