GG-9655 Removed CLIENT_ONLY mode