Merge remote-tracking branch 'github/develop' into atalarm
[atalarm] Fix log
Merge remote-tracking branch 'github/atalarm'