Merge remote-tracking branch 'upstream/wip_4955' into wip_pg_res