During integration of the fix for #6445 there were some exposed issues in Catch2 reported by ThreadSanitizer.
The dependency is one year old at this point, let's try to update it.