Merge "Keep HUNs that have an active remote input" into nyc-dev