Merge "Add new core tags"