diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ae3a03ed..9936d7492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,45 +12,46 @@ FEATURES:
  * **New Resource:** `cloudstack_affinity_group` [GH-8360]
  * **New Resource:** `librato_alert` [GH-8170]
  * **New Resource:** `librato_service` [GH-8170]
+ * Data source blocks can now have a count associated with them [GH-8635]
  * The count of a resource can now be referenced for interpolations: `self.count` and `type.name.count` work [GH-8581]
 
 IMPROVEMENTS:
- * core: Show last resource state in a timeout error message [GH-8510]
- * core: HTTP module sources can now use netrc files for auth
  * core: Add wildcard (match all) support to `ignore_changes` [GH-8599]
+ * core: HTTP module sources can now use netrc files for auth
+ * core: Show last resource state in a timeout error message [GH-8510]
  * helper/schema: Add diff suppression callback [GH-8585]
- * provider/aws: Add support for assuming a role prior to performing API operations [GH-8638]
- * provider/aws: Spurious diffs of `aws_s3_bucket` policy attributes due to JSON field ordering are reduced [GH-8615]
+ * provider/aws: API Gateway Custom Authorizer [GH-8535]
  * provider/aws: Add MemoryReservation To `aws_ecs_container_definition` data source [GH-8437] 
+ * provider/aws: Add ability Enable/Disable For ELB Access logs [GH-8438]
+ * provider/aws: Add support for assuming a role prior to performing API operations [GH-8638]
  * provider/aws: Export `arn` of `aws_autoscaling_group` [GH-8503]
  * provider/aws: More robust handling of Lambda function archives hosted on S3 [GH-6860]
+ * provider/aws: Spurious diffs of `aws_s3_bucket` policy attributes due to JSON field ordering are reduced [GH-8615]
  * provider/aws: `name_regex` attribute for local post-filtering of `aws_ami` data source results [GH-8403]
- * provider/aws: API Gateway Custom Authorizer [GH-8535]
- * provider/aws: Add ability Enable/Disable For ELB Access logs [GH-8438]
  * provider/statuscake: Add support for contact-group id in statuscake test [GH-8417]
  
 BUG FIXES:
- * core: `-var` flag inputs starting with `/` work 
- * core: `-var` flag inputs starting with a number work and was fixed in such a way that this should overall be a lot more resilient to inputs [GH-8044]
+ * core: Changing a module source from file to VCS no longer errors [GH-8398]
  * core: JSON configuration with resources with a single key parse properly [GH-8485]
  * core: States with duplicate modules are detected and an error is shown [GH-8463]
- * core: Changing a module source from file to VCS no longer errors [GH-8398]
  * core: Validate uniqueness of variables/outputs in a module [GH-8482]
- * provider/aws: Stop `aws_instance` `source_dest_check` triggering an API call on each terraform run [GH-8450]
- * provider/aws: If an `aws_security_group` was used in Lambda function it may have prevented you from destroying such SG due to dangling ENIs created by Lambda service. These ENIs are now automatically cleaned up prior to SG deletion [GH-8033]
- * provider/aws: `aws_volume_attachment` detachment errors are caught [GH-8479]
- * provider/aws: Refresh `aws_route` from state if `aws_route_table` not found [GH-8443]
- * provider/aws: Increase `aws_route_table` timeouts from 1 min to 2 mins [GH-8465]
- * provider/aws: Remove unsafe ptr dereferencing from ECS/ECR [GH-8514]
+ * core: `-var` flag inputs starting with `/` work 
+ * core: `-var` flag inputs starting with a number work and was fixed in such a way that this should overall be a lot more resilient to inputs [GH-8044]
  * provider/aws: Add AWS error message to retry APIGateway account update [GH-8533]
- * provider/aws: adds resource retry to `aws_spot_instance_request` [GH-8516]
- * provider/aws: Handle missing EFS mount target in `aws_efs_mount_target` [GH-8529]
- * provider/aws: Increase aws_rds_cluster timeout to 40 minutes [GH-8623]
- * provider/aws: Set `apply_method` to state in `aws_db_parameter_group` [GH-8603]
- * provider/aws: Fix. Adjust create and destroy timeout in aws_vpn_gateway_attachment. [GH-8636]
- * provider/aws: Remove `aws_elasticsearch_domain` from state if it doesn't exist [GH-8643]
  * provider/aws: Do not set empty string to state for `aws_vpn_gateway` availability zone [GH-8645]
+ * provider/aws: Fix. Adjust create and destroy timeout in aws_vpn_gateway_attachment. [GH-8636]
+ * provider/aws: Handle missing EFS mount target in `aws_efs_mount_target` [GH-8529]
+ * provider/aws: If an `aws_security_group` was used in Lambda function it may have prevented you from destroying such SG due to dangling ENIs created by Lambda service. These ENIs are now automatically cleaned up prior to SG deletion [GH-8033]
+ * provider/aws: Increase `aws_route_table` timeouts from 1 min to 2 mins [GH-8465]
+ * provider/aws: Increase aws_rds_cluster timeout to 40 minutes [GH-8623]
+ * provider/aws: Refresh `aws_route` from state if `aws_route_table` not found [GH-8443]
+ * provider/aws: Remove `aws_elasticsearch_domain` from state if it doesn't exist [GH-8643]
+ * provider/aws: Remove unsafe ptr dereferencing from ECS/ECR [GH-8514]
+ * provider/aws: Set `apply_method` to state in `aws_db_parameter_group` [GH-8603]
+ * provider/aws: Stop `aws_instance` `source_dest_check` triggering an API call on each terraform run [GH-8450]
  * provider/aws: Wait for `aws_route_53_record` to be in-sync after a delete [GH-8646]
+ * provider/aws: `aws_volume_attachment` detachment errors are caught [GH-8479]
+ * provider/aws: adds resource retry to `aws_spot_instance_request` [GH-8516]
  * provider/azurerm: Reordering the checks after an Azure API Get [GH-8607]
  * provider/chef: Fix "invalid header" errors that could occur [GH-8382]
  * provider/github: Remove unsafe ptr dereferencing [GH-8512]