Replaces the shore setup with a extended common setup
Deletes the old panel tabs in shore setup dialog
Merge branch 'anotherbranch'