Merge remote branch 'remotes/origin/acid-burn/bug_622_swupgrade_networkcheck'