Merge branch 'use-pg12-in-ci' into 'develop'