issue #19721: More progress on priv. checking for orms