Merge remote-tracking branch 'origin/request_timeout' into autostaging