issue #21491: Fix orm.