chore: Rebase avahi_name_conflict
commits onto edge
#10706
Merged
avahi_name_conflict
commits onto edge
#10706