Add rebased changes