Bring revisions #25440 - #25484 from trunk to revise_chunks.
h5committested.
(Revision #25439 is skipped because it was backed out later on 11/3/2104.)