Merge branch 'dcs-hybridcloud'