Merge branch 'release/v2.8.6'
fix bug on tag replacement
Merge branch 'hotfix/v2.8.7' into develop