Fix includes
Point visualization in Observer
Merge conflicts fixed