committing last changes of 2013 VM2.0