Always perform version-negotiation Upstream-commit: 75a034621d715bf01069cc3f7bab0cce85fa744c Component: engine