Next development iteration for 3.5.x