parameterized scripts; added jsonStreaming to import
Merge branch 'master' into dev