Merge "bugfix: autoupdate failed due to mingle with watchdog"