Merge back from develop3d

GOTTA GO UPSTREAM