ssue #19444: made bi export more generalizable