fit icat coverity issues. re #9928
Merge branch 'feature/9928_icat_coverity' into develop