Dynamic dialog field data migration

This should be merged in after #1130 

/cc @gmcculloug