Merging changes on 1.6.4 branch into trunk