Resolve script problems executed from cli

lopezaguilarrequested to merge
develop into master

Merge request reports