Implement CanaryModTeam/CanaryLib@24eec3b changes