Merge branch 'tg/tag-state-tag-name-in-editor-hints'