fix bug on tag replacement
Merge branch 'hotfix/v2.8.7'