Merge "add missing context setting" into udc-dev