Merge branch '1.6.4'