Automatic height expansion, and prepare to rebase