Merge "Reduce individual quota alarms set." into rvc-dev