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