DEVSUPPORT-1611 Added tag support