En picks/sync from fork day

There is still a lot of much more work to pick, but lets start merging stuff.