Merge branch 'oprofile/cell' into oprofile/oprofile-for-tip