Update BB with hotfixes