[569] Temporary workaround api 502s