Merge branch 'stroke-timeout'