Merge "Fix access to dictionary variable "server""