Merge branch 'quota_interface' into for_next_testing