Core changes to support tee filter.