commit 140617 1340