Merge branches 'sh/core' and 'sh/serial-rework' into sh-fixes-for-linus