Fix [SonarQube] TODO tags should be handled (Complete the task
associated to this TODO comment)