TWIN: Fix rebase issues