Merge pull request #9849 from neheb/pbc