Merge branch 'remove-tag-warning' into 'develop'