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