FQA-1457: updat following reviewer