Update TODOs for SPR-11574

Issue: SPR-11574