Second step in merge of new_tags_api branch into master