Refactor tiny version parsing Upstream-commit: 51aa2a226e21e20c5b4634a28245c760f4e18f37 Component: engine