FQA-1298:update comments from vuna2