Merge "Send ports change broadcast explicitly" into main