trebon: sync with cm-10.1 changes