Merge "Separating alarm history for lower quota" into sc-dev