JIRA 403 - merged the two migrations into one,