d2tmo: re-align/sync with cm-10.1