Quotas merge

This is a merge PR, merging 'quotas' into 'master' branch.