Tags API
REF T296
Merge remote-tracking branch 'origin/master'