[KFSQA-855] fix a merge issue
[KFSQA-974] merge from master