Pull dmi-2.6.24 into release branch