commit3 for branch 21