Support projecting spheres.
Merge remote-tracking branch 'upstream/master'
Sync with upstream