#2 Fixed behavior under thunderstorms
Merge remote-tracking branch 'origin/hotfix-1.0' into dev