ECMS/FQA-1234:update vuna2's comments