issue #21482: enforced and fixed orm types