Fix merge conflicts

[fvanderlinden]

Thanks for re-submitting! Hope it did not take too much time!

[tbeu]

Well, I cherry picked my four commits that got reverted later and fixed the merged conflicts. Tools are extremely helpful here.