3.5 merge started