Merge branch 'acid-burn/bug_622_swupgrade_networkcheck' into experimental