Merge bb10 changes.