commit minor changes for branch 2.02