Core: Improving TAPS performance (code changes, but disabled)