Merge back from develop3d

Good thing they're doing content pipeline nonsense