Merge "R8 tag/path update"