[PLAT-4030] CDS quote types
Merge remote branch 'refs/remotes/origin/develop' into develop