Merge "Use correct filter" into udc-dev