Merge "Use global storage templates for PVC"