trying to get rid of warning with signed/unsigned comparison
COMP: Merge branch 'bug-16236-final-version-for-master'