Merge branches 'sh/serial-rework' and 'sh/oprofile'