Resolve #320 and add related migration step.

@dnouri implementation should be complete.  However: one test test is failing and I have no clue why.