actually test the timeout
Merge branch '1.12'