Re: #1760 - backend changes for tag handling
Merge branch 'ticket-1760-tags' into develop