Merge branch 'develop' into VCL-1093