Latest modifications for the official release of 2013-03-10