Pull misc-2.6.40 into release branch