Merge bbapp and bbos.