Merge "Don't throw if the matching key contains ":"." into udc-dev