Next attempt of rebase test