Merge "Fix the DSU notification behavior" into main