Merge branch 'develop' into coverity-scan