Setup and cleanup

Merged Stefan Achmüller requested to merge as_setup into master

Merge request reports