Merge "Save alarm resources" into sc-v2-dev