[KFSQA-995] changes made based on review comments