* Merge pull request #32059 from ShizCalev/shade-heartbeat Fixes shades hearing heartbeats * Fixes shades hearing heartbeats