[PATCH v2 master] update to 6.4.0-1.0.1