Add patches for bug 947654