Note, this has some commits from branch 58-....
58-...
Will look into tomorrow, should resolve all other conflicts too
merged