Merge "Fix replying to queries via unicast" into main