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