[Bug 420018] Changes in sw_single and online_update