commit 0717 1716