Merge in 1.6.5.4