Include merges from changes.txt and recent Andreas +filter change.