commit2 for branch 17