Merge "Fixing default timeout constant" into rvc-dev