Merge pull request #1748 from valentinewallace/2022-10-custom-oms