Development commit of 0.6