Migration

Merged Markus Scheidgen requested to merge migration into master

Merge request reports