D-14212 more changes to fix extension filter bundle