Merge branch 'feature/fix-coverity-defects' into next