TMDM-8055: Fix deprecated API usage