#JC-1381 - Fixed notices of the code review
#JC-1381 - Fixed notices of the code review