Merge my develop3d stuff into new develop

And now we get back to work?