Merge "Fix bug in policy engine" into udc-dev