Merge branch 'ms/fetch-follow-tag-optim'