OrchardCore: ConcurrencyException on Multi-Tenant

This might be most relevant to @jtkech - I upgraded to the latest code bits and now my multi-tenant (primary website) on my dev box throws this exception:

OrchardCore.Data.Documents.DocumentStoreCommitException: The ‘SiteSettings’ could not be persisted and cached as it has been changed by another process. —> YesSql.ConcurrencyException: The document could not be updated as it has been changed by another process. at YesSql.Commands.UpdateDocumentCommand.ExecuteAsync(DbConnection connection, DbTransaction transaction, ISqlDialect dialect, ILogger logger) at YesSql.Session.FlushAsync() at YesSql.Session.CommitAsync() at YesSql.Session.CommitAsync() at OrchardCore.Data.Documents.DocumentStore.CommitAsync() — End of inner exception stack trace — at OrchardCore.Data.Documents.DocumentStore.<>c__111.<UpdateAsync>b__11_1(Exception exception) at OrchardCore.Data.Documents.DocumentStore.CommitAsync() at OrchardCore.Environment.Shell.Scope.ShellScope.BeforeDisposeAsync() at OrchardCore.Environment.Shell.Scope.ShellScope.UsingAsync(Func2 execute, Boolean activateShell) at OrchardCore.Environment.Shell.Scope.ShellScope.ActivateShellInternalAsync() at OrchardCore.Environment.Shell.Scope.ShellScope.UsingAsync(Func`2 execute, Boolean activateShell) at OrchardCore.Modules.ModularTenantContainerMiddleware.Invoke(HttpContext httpContext) at Microsoft.AspNetCore.Diagnostics.DeveloperExceptionPageMiddleware.Invoke(HttpContext context)

The lower level tenants work fine. It is a dev box so it isn’t a huge deal, likely can blow away the main site and rebuild it without too much issue. However, if there is something important to try and figure out here, I will gladly help. I know Concurrency has been a topic in recent pull requests. I thought about removing each tenant (e.g. shell) to see if one of them could somehow be causing the issue. Look forward to any thoughts you have / how I might best diagnose this.