Merge "Fix tag name for KRT16M"