[KFSQA-997]  changes made based on review comment.