[KFSQA-633] changes made after review