Continue tag way implementation

X-Ref: #11166