Merge pull request #2821 from TheBlueMatt/2024-01-om-direct-export