commit2 for branch 317