Merge "Fix Coverity issues" into devel/master