Merge "Use ISE to indicate alarm limit" into qt-dev