case 2163 - Unlimited values for tags field.
Merge branch 'case-2163' into develop