Merge "Fix monitoring stack for remote agent"