Merge feature/database-reporter into develop