Migration PATCH: ONE TIME

This commit should contain all the changes which should be applied
after the repositories have been merged