Catch live fish when fishing! But watch out for Pufferfish, those might make for a nasty surprise!
Merge: Update to 26.1 (#1256)
