Merge "Add missing close in sending uidMap" into udc-dev