Merge circulation and cataloging from 2.1 branch.