Full fix for REST API for CROS domain