getting ready for v1.6 merge