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