Small headless client optimize
wip
Merge remote-tracking branch 'upstream/master' into octree