Issue #416 done. Migrations regenerated.