Merge "Fix Svace+Coverity issue" into devel/master