Merge pull request #1809 from valentinewallace/2022-10-custom-om-self