Coverity.
Merge branch 'develop' into new-split