commit3 for branch 18