Merge pull request #2 from p2t2/DEV2.4.0

Dev2.4.0
Minor changes to shared BP code.
Merge pull request #294 from bruttenberg/DEV2.4.0

Dev2.4.0