[FIX] - Fixed TODO-7.0 and TODO-6.1 location.
Merge pull request #9 from CLEARCORP-dev/8.0_branch_fix

[FIX] - Fixed TODO-7.0 and TODO-6.1 location.