Merge "Modify Script matching algorithm" into udc-dev