@NielsZeilemaker What do you say about removing this query here? As @LipuFei  and I understand, this is only a sanity check. So we where thinking about making sure the unit tests are really testing for this and removing this query to simplify the async DB migration.