Merge branch 'mh/rebase-skip-hard'