issue #20734: Add support for other order types