@Todo tasks for GCI

Any reason as to why these changes were added ? 
( Could you point me to a To-Do for this ? I can't see one )