NIT-20: Removing the TODO comments from the code after creating corresponding issues on GitHub issue management system
Merge branch 'NIT-20' into development