KFSQA-643 stashing to do code review