add support and examples for tags, CPU-268
Merge remote-tracking branch 'origin/master'