CR-IC-2485 (deprecation policy specified; deprecated API usage upgraded)