core-6058 core-6059 fix tag remove and editing.
Merge branch 'dev'