CS-4921: Update comment with todo