Merge "Fix legacy tether behavior for duplicate requests" into main