Merge "Fix Coverity issue" into devel/master