Fixes #2615: upgrade guide improvements