Release 7 4 pbone

I suggest that these fixes should be put on the current release branch.

Thanks.