Merge guillermo's quota changes