Merge back from develop3d

Doop