Merge "Fix bbs dgs bug,replace 'vendor' by 'manufacturer'"