commit 0717 1341