New3dapi, Catch up changes from master

Catch up changes from master