commit 0717 1535