Merge branch '3599_fish_minor_major'