Could you try applying the following two patches: