Merge "Removing headers from all filter types" into jb-mr2-dev