[KFSQA-744] re-merge from master after yesterday's fix on master