Pull in pbulk fixes from trunk.