Empty database should ignore this field
Merge branch 'topic/fix-migration' into v1.3