Fix 2585 and clean up warning in contributing.rst Upstream-commit: f26da9638fc7daf0fac6c138ac3b9b040aef19fb Component: engine