nothiung
Revert "nothiung"

This reverts commit 565a50d25be1908f9afd7ca16d2f55114e8d3700.
Merge branch 'feature/database-configuration' into develop