path fixes
Merge remote-tracking branch 'origin/fixes/upgrades_versions' into fixes/upgrades_versions