Merge from Telescope:master

Merge from Telescope:master