Merge branch 'request_timeout' into autostaging