Merge changes from topic "jc/coverity-fixes" into integration