Sync 2.4.10 with master RE ghostwheel42's npn patch