Core 2 Commit

- db
- config
- frontend