initial 1.6.4 commit