Still too agressive *sigh*
Smaller yet
Just increase the timeout on this check
Merge branch 'master' into concurrent_testability