Merge back from develop3d

Usual.