Merge BB fixes into bb-develop branch