[KFSQA-967] changes made for review