Merge branch 'master' into tp-tube