1.6.4 commit