Jessica|Charlie - added collation-server setting