actually create the alarm this time.... :)
Merge remote-tracking branch 'origin/1.10' into 1.12