Merge "Fix coverity issue" into devel/master