Merge branch 'master' into telescope-updates