Merge branch 'mh/rebase-fixup' (early part)