script optimizations

Stephanrequested to merge
se-script-optimizations into master

Merge request reports