Implemented NAFQA-228. Unfinished code to code lines
Merge branch 'Release' into NAFQA-227_check_comments
CR-changes NAFQA-228: Unfinished code to code lines