[ADD] Store quota_amount & quota_qty

Merged Santiago Said requested to merge WIP into 11.0-stage

Merge request reports