Merge "Add better timeout mechanism for running commands."