Migration for 963600
Merge pull request #1826 from selenamarie/bug963600-migration

Migration for 963600