Merge "Add refactor discovery manager flag" into udc-dev