Merge "Adding a reserve of temporary quota for alarms" into tm-dev