Minor updates in support of more fundamental BP changes...
Merge branch 'staging' of github.com:Placester/builder into staging