Soft upgrades#2151

lbesson wants to merge 3 commits into

masterc2corg/v6_api:masterfrom

upgrade-softwarec2corg/v6_api:upgrade-softwareCopy head branch name to clipboard