Bring revision #25508 - #25509 from trunk to revise_chunks.
h5committested.