Merge remote-tracking branch 'remotes/origin/BUG-3728-Watchdog_Crash'
Merge remote-tracking branch 'remotes/upstream/master' into 1.3.0Alpha_SEB_ADDONV3_HomeY