Issue #361 not finished (+migration)