Merge "BUG 2307: Filtering proxy for Schema context functionality"