Updating to latest BP commit
Merge branch 'staging'