Update to the latest changes in the Glimpse 2.0 branch