commit2 for branch 378