Bring revisions #25509 - #25762 from trunk to revise_chunks.
h5committested.