FQA-1234:update comments from vuna2