Merge "Add PROTOCOL_UNKOWN" into tm-dev