KFSQA-880 changes from code review