Sync with vigor/cm-11.0