More effective size control on attic queries.
Merge remote-tracking branch 'upstream/minor_issues' into test751