resolve API-5049