Fixes for CCV
Merge branch 'release-1.0.14-ccv' into develop
Merge remote-tracking branch 'origin/develop' into develop