[KFSQA-763] changes made based on review comments