general settings database structure migration
merged branch