Work for issues 50-32-3-35; Needs to run migration 0006