Update to 3.4-M6-SNAPSHOT