Moved non-version specific code out of useful-bp*e.h
Merge remote-tracking branch 'upstream/master'