Merge "Allow output from DumpController to be filtered"