Merge back from develop3d

Again