17/07 commit