Reduce conversions and parsing
Merge pull request #14818 from s0undt3ch/hotfix/manage.version

Reduce conversions and parsing