Update patches for cm-12.0