KFSQA-864 stashing changes to do code review