Development started for v3.6