Merge "Coverity issue fixes" into devel/master