Merge "[CDS] Use global storage templates for PVC"