Major commit from 30-03-2013