added surround intentions for filters
merged master into dataflow