Merge branch '4372_fish_resize'