Merge "Fix minor coverity issue" into devel/master