Fix synchronization of verifyDatabaseIntegrity()
Merge branch 'master' into event-notifications
Fix synchronization of verifyDatabaseIntegrity()