Merge branch 'getdata-tags-and-doc'