Merge branch 'nh/empty-rebase'