Merge branch 'master' into dev
Bug fix - search by tag - only in current session
Merge branch 'dev'