Merge master

- Salesforce tweaks
- Bb version with widget hotfix