2.6 merge