[KFSQA-1007] changes made for review comments