Jens, can you pick this one up for 6.11? We can't really trigger it as-is, but it would be good to get it out of the way and avoid someone else triggering the issue (e.g. Mikulas with his dm-integrity work).