Merge "[CDS] Bump CDS versions for RC1 bug fixes"