Continue tag way implementation
Merge pull request #11183 from ZDroid/patch-1

Continue tag way implementation