Merge "Fix wrong logic in macro key handling." into udc-dev