FQA-2020:Update comments