Resolve "migration issue"

Merged Piotr Gawron requested to merge 1453-migration-issue into master
Edited by Piotr Gawron

Merge request reports