FQA-1457 : update following reviewer