commit3 for branch 17