Merged in H5BP and adjusted more parts.