fit icat coverity issues. re #9928
Merge remote-tracking branch 'origin/feature/9928_icat_coverity'