Bring revisions #25819 - #25823 from trunk to revise_chunks.
h5committested.