Merge commit 'origin/bug_550_fix_softwareupgradecounter'