Merge back from develop3d

Ending today on this note I guess.