Updates to coincide with Canary Crow 5.8.11