commit 0715 1239