Make checking of help text smarter Upstream-commit: 4f18fc0bd2bed615ddc4c9b0e96d11f2810705d9 Component: engine