Merge "bug-fix: insecure option for quota setting"