commit 0717 1607