Merge branch 'en/rebase-no-keep-empty'