issue #19444: made BI export more general

Do not merge this in until express is merged in as well.