diff --git a/c7n/resources/asg.py b/c7n/resources/asg.py
index 9d01ee426..181141dd9 100644
--- a/c7n/resources/asg.py
+++ b/c7n/resources/asg.py
@@ -1215,7 +1215,7 @@ class PropagateTags(Action):
         if self.data.get('trim', False):
             instances = [self.instance_map[i] for i in instance_ids]
             self.prune_instance_tags(client, asg, tag_set, instances)
-        if not self.manager.config.dryrun:
+        if not self.manager.config.dryrun and instances:
             client.create_tags(
                 Resources=instance_ids,
                 Tags=[{'Key': k, 'Value': v} for k, v in tag_map.items()])
diff --git a/c7n/resources/elasticsearch.py b/c7n/resources/elasticsearch.py
index e1355b824..76a50680f 100644
--- a/c7n/resources/elasticsearch.py
+++ b/c7n/resources/elasticsearch.py
@@ -18,7 +18,7 @@ from c7n.filters import MetricsFilter
 from c7n.filters.vpc import SecurityGroupFilter, SubnetFilter, VpcFilter
 from c7n.manager import resources
 from c7n.query import ConfigSource, DescribeSource, QueryResourceManager, TypeInfo
-from c7n.utils import local_session, type_schema
+from c7n.utils import chunks, local_session, type_schema
 from c7n.tags import Tag, RemoveTag, TagActionFilter, TagDelayedAction
 
 from .securityhub import PostFinding
@@ -34,6 +34,7 @@ class DescribeDomain(DescribeSource):
     def augment(self, domains):
         client = local_session(self.manager.session_factory).client('es')
         model = self.manager.get_model()
+        results = []
 
         def _augment(resource_set):
             resources = self.manager.retry(
@@ -45,7 +46,10 @@ class DescribeDomain(DescribeSource):
                     client.list_tags, ARN=rarn).get('TagList', [])
             return resources
 
-        return _augment(domains)
+        for resource_set in chunks(domains, 5):
+            results.extend(_augment(resource_set))
+
+        return results
 
 
 @resources.register('elasticsearch')
diff --git a/docs/source/aws/examples/eipgarbagecollect.rst b/docs/source/aws/examples/eipgarbagecollect.rst
new file mode 100644
index 000000000..24c846d9d
--- /dev/null
+++ b/docs/source/aws/examples/eipgarbagecollect.rst
@@ -0,0 +1,95 @@
+EIP - Garbage Collect Unattached Elastic IPs
+============================================
+
+Use the ``mark-for-op`` action to mark a resource for action later. One common
+pattern to follow is to mark a resource with an operation (example: release) in
+n days. In the subsequent days leading up to the marked date, run a unmark or
+untag policy if the resource has become compliant in the mean time.
+
+You can use this principle to implement garbage collection on resources. In this
+example, Custodian will first mark all unattached Elastic IPs for removal. The
+next policy will then unmark any EIP that has been attached and has the
+``maid_status`` tag, indicating that it had been previously marked. Finally, the
+third policy will filter in any resources that have been marked and run the
+``release`` action.
+
+It is important to note that the release policy will need to be run on the day that
+the resource is marked for, else the resource will still exist in the account.
+The mark operation only tags the resource with metadata about the upcoming operation.
+Operationally, the policy still must be executed on the day that is specified in
+the tag.
+
+Note: all resources that are ``marked-for-op`` up to and including the current
+date will be filtered in when utilizing the ``marked-for-op`` filter.
+
+  .. code-block:: yaml
+
+    vars:
+      notify: &notify
+        type: notify
+        to:
+          - slack://#slack-channel
+        subject: "EIP - No Instances Attached - [custodian {{ account }} - {{ region }}]"
+        transport:
+          type: sqs
+          queue: https://sqs.us-east-2.amazonaws.com/123456789012/mailer
+          region: us-east-2
+      run_mode: &run_mode
+        type: periodic
+        schedule: "rate(1 day)"
+        tags:
+          app: "c7n"
+          env: "tools"
+          account: "{account_id}"
+      eip_filters: &eip_filters
+        - type: value
+          key: InstanceId
+          value: absent
+        - type: value
+          key: AssociationId
+          value: absent
+
+    policies:
+      - name: unused-eip-mark
+        resource: network-addr
+        description: "Mark any EIP with no instances attached for action in 7 days"
+        filters:
+          - "tag:maid_status_eip": absent
+          - and: *eip_filters
+        mode:
+          <<: *run_mode
+        actions:
+          - type: mark-for-op
+            tag: maid_status_eip
+            days: 7
+            op: release
+
+      - name: unused-eip-unmark-if-in-use
+        resource: network-addr
+        description: |
+          Remove the maid_status_eip tag from any eip which has instances attached
+        filters:
+          - "tag:maid_status_eip": not-null
+          - not: 
+            - or: *eip_filters
+        mode:
+          <<: *run_mode
+        actions:
+          - type: remove-tag
+            tags: [maid_status_eip]
+
+      - name: unused-eip-action
+        resource: network-addr
+        description: "Release EIP after 7 days of having no instances"
+        filters:
+          - "tag:maid_status_eip": not-null
+          - type: marked-for-op
+            op: release
+            tag: maid_status_eip
+        mode:
+          <<: *run_mode
+        actions:
+          - type: release
+          - <<: *notify
+            action_desc: "EIP released"
+            violation_desc: "EIP has been unused for 7 days"

aws.elasticsearch Error Scanning More Than 5 domains
**Describe the bug**
When running any elasticsearch policy on an account region with more than 5 elasticsearch domains the policy now bombs out with the error - ```error:An error occurred (ValidationException) when calling the DescribeElasticsearchDomains operation: Please provide a maximum of 5 Elasticsearch domain names to describe.```

**To Reproduce**
Create 6 es domains and run an elasticsearch c7n policy, error will occur

**Expected behavior**
It should chunk the calls into domains of 5 or less


**Background (please complete the following information):**
 - OS: Ubuntu v20
 - Python Version: 3.8
 - Custodian Version: 0.9.2.0
 - Tool Version: [if applicable]
 - Cloud Provider: aws
 - Policy:  any policy which queries ES
 - Traceback: 
```
[ERROR]	2020-05-22T14:51:25.978Z	9ef7929b-b494-434e-9f9f-dfdfdfdfdfdfd Error while executing policy
Traceback (most recent call last):
  File "/var/task/c7n/policy.py", line 291, in run
    resources = self.policy.resource_manager.resources()
  File "/var/task/c7n/query.py", line 466, in resources
    resources = self.augment(resources)
  File "/var/task/c7n/query.py", line 521, in augment
    return self.source.augment(resources)
  File "/var/task/c7n/resources/elasticsearch.py", line 48, in augment
    return _augment(domains)
  File "/var/task/c7n/resources/elasticsearch.py", line 39, in _augment
    resources = self.manager.retry(
  File "/var/task/c7n/utils.py", line 373, in _retry
    return func(*args, **kw)
  File "/var/task/botocore/client.py", line 316, in _api_call
    return self._make_api_call(operation_name, kwargs)
  File "/var/task/botocore/client.py", line 635, in _make_api_call
    raise error_class(parsed_response, operation_name)
botocore.errorfactory.ValidationException: An error occurred (ValidationException) when calling the DescribeElasticsearchDomains operation: Please provide a maximum of 5 Elasticsearch domain names to describe.
```
 - `custodian version --debug` output

**Additional context**
Seems to be introduced with 0.9.2.0

diff --git a/tests/data/placebo/test_asg_propagate_tag_no_instances/autoscaling.DescribeAutoScalingGroups_1.json b/tests/data/placebo/test_asg_propagate_tag_no_instances/autoscaling.DescribeAutoScalingGroups_1.json
new file mode 100644
index 000000000..3e8368da5
--- /dev/null
+++ b/tests/data/placebo/test_asg_propagate_tag_no_instances/autoscaling.DescribeAutoScalingGroups_1.json
@@ -0,0 +1,64 @@
+{
+    "status_code": 200,
+    "data": {
+        "AutoScalingGroups": [
+            {
+                "AutoScalingGroupARN": "arn:aws:autoscaling:us-east-1:123456789012:autoScalingGroup:5fd42b45-825e-45c1-b02a-6a97d9512f30:autoScalingGroupName/c7n.asg.ec2.01",
+                "TargetGroupARNs": [],
+                "SuspendedProcesses": [],
+                "DesiredCapacity": 1,
+                "Tags": [
+                    {
+                        "ResourceType": "auto-scaling-group",
+                        "ResourceId": "CustodianASG",
+                        "PropagateAtLaunch": true,
+                        "Value": "ubuntu",
+                        "Key": "Platform"
+                    }
+                ],
+                "EnabledMetrics": [],
+                "LoadBalancerNames": [],
+                "AutoScalingGroupName": "c7n.asg.ec2.01",
+                "DefaultCooldown": 300,
+                "MinSize": 1,
+                "Instances": [
+                ],
+                "MaxSize": 1,
+                "VPCZoneIdentifier": "subnet-ea6429a3,subnet-2c5dcf01",
+                "HealthCheckGracePeriod": 300,
+                "TerminationPolicies": [
+                    "Default"
+                ],
+                "LaunchConfigurationName": "c7n.asg.01",
+                "CreatedTime": {
+                    "hour": 19,
+                    "__class__": "datetime",
+                    "month": 2,
+                    "second": 3,
+                    "microsecond": 171000,
+                    "year": 2017,
+                    "day": 24,
+                    "minute": 0
+                },
+                "AvailabilityZones": [
+                    "us-east-1a",
+                    "us-east-1b"
+                ],
+                "HealthCheckType": "EC2",
+                "NewInstancesProtectedFromScaleIn": false
+            }
+        ],
+        "ResponseMetadata": {
+            "RetryAttempts": 0,
+            "HTTPStatusCode": 200,
+            "RequestId": "770b2115-fac8-11e6-ac2c-5ff00137fb8b",
+            "HTTPHeaders": {
+                "x-amzn-requestid": "770b2115-fac8-11e6-ac2c-5ff00137fb8b",
+                "vary": "Accept-Encoding",
+                "content-length": "7006",
+                "content-type": "text/xml",
+                "date": "Fri, 24 Feb 2017 19:35:57 GMT"
+            }
+        }
+    }
+}
diff --git a/tests/data/placebo/test_asg_propagate_tag_no_instances/ec2.CreateTags_1.json b/tests/data/placebo/test_asg_propagate_tag_no_instances/ec2.CreateTags_1.json
new file mode 100644
index 000000000..420881faf
--- /dev/null
+++ b/tests/data/placebo/test_asg_propagate_tag_no_instances/ec2.CreateTags_1.json
@@ -0,0 +1,20 @@
+{
+    "status_code": 400,
+    "data": {
+        "Error": {
+            "Code": "MissingParameter",
+            "Message": "The request must contain the parameter resourceIdSet"
+        },
+        "ResponseMetadata": {
+            "RequestId": "f229a23a-def5-4288-8ee0-f754ea63eda2",
+            "HTTPStatusCode": 400,
+            "HTTPHeaders": {
+                "transfer-encoding": "chunked",
+                "date": "Thu, 21 Nov 2019 18:49:02 GMT",
+                "connection": "close",
+                "server": "AmazonEC2"
+            },
+            "RetryAttempts": 0
+        }
+    }
+}
diff --git a/tests/data/placebo/test_asg_propagate_tag_no_instances/ec2.DeleteTags_1.json b/tests/data/placebo/test_asg_propagate_tag_no_instances/ec2.DeleteTags_1.json
new file mode 100644
index 000000000..8a17226c3
--- /dev/null
+++ b/tests/data/placebo/test_asg_propagate_tag_no_instances/ec2.DeleteTags_1.json
@@ -0,0 +1,9 @@
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {
+            "HTTPStatusCode": 200,
+            "RequestId": "1b312937-e532-443a-99bd-1dab530b4a84"
+        }
+    }
+}
diff --git a/tests/test_asg.py b/tests/test_asg.py
index a4b7d75b5..a7c3d5b41 100644
--- a/tests/test_asg.py
+++ b/tests/test_asg.py
@@ -819,6 +819,28 @@ class AutoScalingTest(BaseTest):
         self.assertEqual(len(resources), 1)
         self.assertEqual(resources[0]["AutoScalingGroupName"], "c7n-asg-np-missing")
 
+    def test_asg_propagate_tag_no_instances(self):
+        factory = self.replay_flight_data("test_asg_propagate_tag_no_instances")
+        p = self.load_policy(
+            {
+                "name": "asg-tag",
+                "resource": "asg",
+                "filters": [{"tag:Platform": "ubuntu"}],
+                "actions": [
+                    {
+                        "type": "propagate-tags",
+                        "trim": True,
+                        "tags": ["CustomerId", "Platform"],
+                    },
+                ],
+            },
+            session_factory=factory,
+        )
+
+        resources = p.run()
+        self.assertEqual(len(resources), 1)
+        self.assertEqual(resources[0]["AutoScalingGroupName"], "c7n.asg.ec2.01")
+
     def test_asg_filter_capacity_delta_match(self):
         factory = self.replay_flight_data("test_asg_filter_capacity_delta_match")
         p = self.load_policy(

pip install -e .
parse_log_pytest_v2
requirements.txt
pytest pytest-cov pytest-xdist pytest-mock pytest-asyncio
apt-get update apt-get install -y gcc
3.7
requirements.txt
pytest -xvs
apipkg==1.5
appdirs==1.4.4
argcomplete==1.11.1
attrs==19.3.0
aws-xray-sdk==2.5.0
bleach==3.1.5
boto3==1.13.14
botocore==1.16.14
-e git+https://github.com/cloud-custodian/cloud-custodian.git@938a500161a5934b628e59695958d6ddcc9be37d#egg=c7n
certifi==2020.4.5.1
cffi==1.14.0
chardet==3.0.4
coverage==5.1
cryptography==2.9.2
distlib==0.3.0
docutils==0.15.2
exceptiongroup==1.2.2
execnet==1.7.1
filelock==3.0.12
flake8==3.8.1
future==0.18.2
idna==2.9
importlib-metadata==1.6.0
iniconfig==2.0.0
jeepney==0.4.3
jmespath==0.10.0
jsonpatch==1.25
jsonpickle==1.4.1
jsonpointer==2.0
jsonschema==3.2.0
keyring==21.2.1
mccabe==0.6.1
mock==4.0.2
more-itertools==8.3.0
multidict==4.7.6
packaging==20.4
pkginfo==1.5.0.1
placebo==0.9.0
pluggy==0.13.1
psutil==5.7.0
py==1.8.1
pycodestyle==2.6.0
pycparser==2.20
pyflakes==2.2.0
Pygments==2.6.1
pyparsing==2.4.7
pyrsistent==0.16.0
pytest==7.4.4
pytest-asyncio==0.21.2
pytest-cov==2.8.1
pytest-forked==1.1.3
pytest-mock==3.11.1
pytest-sugar==0.9.3
pytest-xdist==1.32.0
python-dateutil==2.8.1
PyYAML==5.3.1
readme-renderer==26.0
requests==2.23.0
requests-toolbelt==0.9.1
s3transfer==0.3.3
SecretStorage==3.1.2
six==1.14.0
tabulate==0.8.7
termcolor==1.1.0
toml==0.10.1
tomli==2.0.1
tox==3.15.1
tqdm==4.46.0
twine==3.1.1
typing_extensions==4.7.1
urllib3==1.25.9
vcrpy==4.0.2
virtualenv==20.0.21
wcwidth==0.1.9
webencodings==0.5.1
wrapt==1.12.1
yarl==1.4.2
zipp==3.1.0

name: cloud-custodian
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - pip=22.3.1=py37h06a4308_0
  - python=3.7.16=h7a1cb2a_0
  - readline=8.2=h5eee18b_0
  - setuptools=65.6.3=py37h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - wheel=0.38.4=py37h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - apipkg==1.5
      - appdirs==1.4.4
      - argcomplete==1.11.1
      - attrs==19.3.0
      - aws-xray-sdk==2.5.0
      - bleach==3.1.5
      - boto3==1.13.14
      - botocore==1.16.14
      - c7n==0.9.2
      - certifi==2020.4.5.1
      - cffi==1.14.0
      - chardet==3.0.4
      - coverage==5.1
      - cryptography==2.9.2
      - distlib==0.3.0
      - docutils==0.15.2
      - exceptiongroup==1.2.2
      - execnet==1.7.1
      - filelock==3.0.12
      - flake8==3.8.1
      - future==0.18.2
      - idna==2.9
      - importlib-metadata==1.6.0
      - iniconfig==2.0.0
      - jeepney==0.4.3
      - jmespath==0.10.0
      - jsonpatch==1.25
      - jsonpickle==1.4.1
      - jsonpointer==2.0
      - jsonschema==3.2.0
      - keyring==21.2.1
      - mccabe==0.6.1
      - mock==4.0.2
      - more-itertools==8.3.0
      - multidict==4.7.6
      - packaging==20.4
      - pkginfo==1.5.0.1
      - placebo==0.9.0
      - pluggy==0.13.1
      - psutil==5.7.0
      - py==1.8.1
      - pycodestyle==2.6.0
      - pycparser==2.20
      - pyflakes==2.2.0
      - pygments==2.6.1
      - pyparsing==2.4.7
      - pyrsistent==0.16.0
      - pytest==7.4.4
      - pytest-asyncio==0.21.2
      - pytest-cov==2.8.1
      - pytest-forked==1.1.3
      - pytest-mock==3.11.1
      - pytest-sugar==0.9.3
      - pytest-xdist==1.32.0
      - python-dateutil==2.8.1
      - pyyaml==5.3.1
      - readme-renderer==26.0
      - requests==2.23.0
      - requests-toolbelt==0.9.1
      - s3transfer==0.3.3
      - secretstorage==3.1.2
      - six==1.14.0
      - tabulate==0.8.7
      - termcolor==1.1.0
      - toml==0.10.1
      - tomli==2.0.1
      - tox==3.15.1
      - tqdm==4.46.0
      - twine==3.1.1
      - typing-extensions==4.7.1
      - urllib3==1.25.9
      - vcrpy==4.0.2
      - virtualenv==20.0.21
      - wcwidth==0.1.9
      - webencodings==0.5.1
      - wrapt==1.12.1
      - yarl==1.4.2
      - zipp==3.1.0
prefix: /opt/conda/envs/cloud-custodian

tests/test_asg.py::AutoScalingTest::test_asg_propagate_tag_no_instances tests/test_asg.py::AutoScalingTest::test_asg_remove_tag tests/test_asg.py::AutoScalingTest::test_asg_rename_tag tests/test_asg.py::AutoScalingTest::test_asg_resize_restore_from_tag tests/test_asg.py::AutoScalingTest::test_asg_resize_save_to_tag tests/test_asg.py::AutoScalingTest::test_asg_resize_to_current tests/test_asg.py::AutoScalingTest::test_asg_resume tests/test_asg.py::AutoScalingTest::test_asg_security_group tests/test_asg.py::AutoScalingTest::test_asg_security_group_not_matched tests/test_asg.py::AutoScalingTest::test_asg_subnet tests/test_asg.py::AutoScalingTest::test_asg_suspend tests/test_asg.py::AutoScalingTest::test_asg_suspend_when_no_instances tests/test_asg.py::AutoScalingTest::test_asg_tag_and_propagate tests/test_asg.py::AutoScalingTest::test_asg_third_ami_filter tests/test_asg.py::AutoScalingTest::test_asg_vpc_filter tests/test_asg.py::AutoScalingTest::test_valid_asg_with_launch_templates
tests/test_asg.py::LaunchConfigTest::test_config_delete tests/test_asg.py::LaunchConfigTest::test_config_unused tests/test_asg.py::TestUserData::test_regex_filter tests/test_asg.py::AutoScalingTemplateTest::test_asg_mixed_instance_templates tests/test_asg.py::AutoScalingTest::test_asg_config_filter tests/test_asg.py::AutoScalingTest::test_asg_delete tests/test_asg.py::AutoScalingTest::test_asg_filter_capacity_delta_match tests/test_asg.py::AutoScalingTest::test_asg_filter_capacity_delta_nomatch tests/test_asg.py::AutoScalingTest::test_asg_image_age_filter tests/test_asg.py::AutoScalingTest::test_asg_image_age_filter_deleted_config tests/test_asg.py::AutoScalingTest::test_asg_image_age_filter_template tests/test_asg.py::AutoScalingTest::test_asg_invalid_filter_bad tests/test_asg.py::AutoScalingTest::test_asg_invalid_filter_good tests/test_asg.py::AutoScalingTest::test_asg_mark_for_op tests/test_asg.py::AutoScalingTest::test_asg_mark_for_op_hours tests/test_asg.py::AutoScalingTest::test_asg_marked_for_op_hours tests/test_asg.py::AutoScalingTest::test_asg_non_encrypted_filter tests/test_asg.py::AutoScalingTest::test_asg_non_encrypted_filter_with_templates tests/test_asg.py::AutoScalingTest::test_asg_not_propagate_tag_match tests/test_asg.py::AutoScalingTest::test_asg_not_propagate_tag_missing tests/test_asg.py::AutoScalingTest::test_asg_propagate_tag_filter tests/test_asg.py::AutoScalingTest::test_asg_propagate_tag_missing
c7n/resources/asg.py docs/source/aws/examples/eipgarbagecollect.rst c7n/resources/elasticsearch.py
c7n/resources/asg.py docs/source/aws/examples/eipgarbagecollect.rst c7n/resources/elasticsearch.py