Inject commit by CanaryModTeam/CanaryMod (bae0896)