CR-IC-1832 (explicit API)