'this script path' handling change/fix
Merge branch 'release/1.0.8'