Merge branch 'hotfix/change_quota_calculation'
Fix
Merge branch 'hotfix/modify_disk_quota_task' into develop