fix jenkins tests
Merge remote-tracking branch 'origin/match-creation' into match-creation