Merge branch 'bugfix/improve-boost-targeting' into 'develop'