Merge master with development

And add to base_tags.json