[KFSQA-744]  changes made based on review comments