Use Object3D to make builder functions side-effect free.
Merge remote-tracking branch 'origin/master'