Re: #1760 - reduced size
Merge branch 'feat/1760-tags' into develop
Merge branch 'develop' into test