Merge pull request #1518 from valentinewallace/2022-06-OMs-prefactor