Change server values
Merge commit '40452b9167357ddb8b92622d823d060f3de00659'