Merge pull request #1604 from valentinewallace/2022-07-OMs-followup