Merge "Show mini-resolver for messages" into udc-dev