* commit '1b755dea38cc428a4adb8b8954bbafaa9c0441fb': Remove discoverable timeout handler. DO NOT MERGE