Mbw/feeslip prepack exclusion and fix