Merge 9.2.0_wip nelsonh's branch into main #311

Closed EttyKitty closed 5 months ago