Merge "Modify the SO to support BBS usecase"