Refs #2535 Rework script window loading
Merge remote-tracking branch 'origin/feature/2535_improve_script_saving'