Merge "Support server-side filtering for UEB"