JIRA 403 - Split the migration in two separate parts.