1.6.4 merge down