Merge branch 'master' into tc
fix move slide routine
Merge branch 'tc'