commit2 for branch 618