Merge "Restore run-test TIME_OUT feature"