Merge "[COMMON] Add a template for PV"