release-next: integration fixes for database initialization