[KFSQA-985]  changes made based on review comments