Timeout fix
Merge branch 'hotfix/1.11.4'