Fix settings on first migration
Merge branch 'devel' into v0.8-beta