Merge "Shorten mTag in VRI"