Rebase outputconfig changes.