Bring revisions #25771 - #25818 from trunk to revise_chunks.
h5committested.
(Revision #25766 is skipped since it reverts #25273, #25283, #25439.)