Merge branch 'develop' into coverity_scan