Bug 25728: fix rebase issues