KFSQA-596 stashing changes for remerge of master into branch