Remove deprecated type
and slop
field in match
query
#26720
Merged
type
and slop
field in match
query
#26720