Merge "Minor bug fixes related to package/dpc removal" into udc-dev