commit2 for branch 246