Merge "Prevent race conditions after dropping database" into oc-dev