Merge "Remove CONF reference from servers client"