1.9 merge