Fix/ex basic setup

Merged Martin Schneider requested to merge fix/ex-basic-setup into master

Merge request reports