Merge "Fix ACTIVE/EXEMPT quota calculation."