Add additional details to upgrade information
Merge remote-tracking branch 'origin/develop' into use-helpers