Merge "Fix to correct the filter setting in order Patched from ag/23208840" into udc-dev