Bring in all the changes from retry_slim_dedicated_server for diff purposes