Faulty geometry optimisation in the new build

Not just Windows, Linux too – see @JGrantHill’s thread.