Merge back from develop3d

Largest no-op in ages