Merge branch 'common/serial-rework' into sh-latest