commit2 for branch 306