More updates to RAZ-2252: API: Option to have the API located on dedicated server