apply bug 35718 patch