Merge 1.6.4.4 in