Use of TODO/FIXME comment encountered SC-D1000

TODO/FIXME comments are usually placed within the source code to indicate that there might be a scenario that is either unaccounted for or that a feature requires further enhancements to function as required. Either way, they must be addressed when and where possible to avoid unintended side-effects or breakdown.