Bug 5349/dev/upgrade screenshotos 2 10

This is a rebase of PR #73