Merge commit 'sebastian/coverity'