commit2 for branch 658