Merge branch '2347_fish_fix'