CLOUD-9 added specific tags