Merge "Add const annotations to dispatcher" into udc-dev