Rest-Api/Public-Api SEPARATION FIX