GPII-1027: Adding a TODO in relation to GPII-1028