Merge "Avoid usage of deprecated setTags() method, use addTags() instead"