Bring revisions #25484 - 25508 from trunk to revise_chunks.
h5committested.