Merge "[COMMON] Fix PV/PVC for postgres"