Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo.