added some models to OHRM
issue #20201: cleared out another xm assumption
fix merge conflict