Merge "BUG-1281: share filters between instances"