Merge in the PRs from master to PG18#2311

MuhammadTahaNaveed merged 11 commits into

apache:PG18apache/age:PG18from

jrgemignani:master_to_PG18_PRsjrgemignani/age:master_to_PG18_PRsCopy head branch name to clipboard