Re: 4.18 Rebase plans