Fix PG vars

9 jobs for !6293 with cherry-pick-2d4cd41e in 33 minutes and 58 seconds (queued for 2 seconds)
latest merge request