[KFSQA-637] changes made for review