cherrypick quota + extension config from mainline