Preparing scitos_ptu_sweep for release

And merging very old changes