Merge "Increase the timeout of waiting for commit completion." into rvc-dev