Merge "CTS: alarms" into pi-dev