Merge of basic timeout changes