MS-186: allow multiple tags
MS-186: spacing
Merge branch 'MS-186-multiple-tags' into develop