Support strict enforcement of dynamic quotas #3695