Rework of merge 2.4 to master

Added data for fisheye test for PR #3071