Merge "Added support for rediscovering a Tag (API)."