Merge remote-tracking branch 'pg/non_pgxs'