Fixed scripts
Merge remote-tracking branch 'origin/master' into ts01
Merge branch 'gpaduan' into ts01
Fixed scripts
Merge branch 'ts01' into gpaduan