Merge "Replaced send broadcast with user aware version" into main