Merge "Fix bbs dgs bug for edge"