commit2 for branch 517