Pull misc2634 into release branch