Merge "Only skip unrecognized tags."