Merge branch 'cr/tag-options'