Database Settings page
Merge branch 'database-settings-page' into new3