V3.6.4 commit