FQA-1234: Update comments from vuna2