Merge "[DSRM] Fix the incorrect broadcast issue" into main