Merge "Shorten flag names." into udc-dev