Merge "Remove unused constructor from Entry class" into udc-dev