SI-6169 TODO: consolidate with fix for SI-1786 (#2518)

TODO comments only

please merge when convenient