Fisheye merge 2.4

Merging fisheye testdata for PR #3071