Bug 40305 v2+macos

Closes #40307 (closed)

This is a WIP branch. It builds but I don't know if it crashes. The single commit could be divided into smaller pieces.