Upstream:  Fix issues with leashes and weather due to missed diff