Merge in timeout changes made in VLER-DAS-4.4.1 branch.