Merge "fixed coverity issue" into devel/master