TDI-3: test with merge instead of rebase