Merge "Fix plugins for hostname-free metrics"