Backported metadata patch for agent-notification from master