Ready for M3, run in version 0.3.1_r17328