Merge branch 'wip_4955' into wip_pg_res_4955