[fixed?] QuadTree issues

Change-Id: I5b03deb0e0a1deef241a9cc59e00bc4eeb7fd093
Merge "[fixed?] QuadTree issues" into unstable