Adding a fix to handle NPE on several classes related with alarms.
Merge remote-tracking branch 'origin/1.10'