NAWQAAN-381; addressed review comments