Re-added script test.
Merge branch 'script-test' into dev