Keep fish in the water
Merge branch 'features/prevent-fish-from-breaking-the-water-surface'