diff --git a/.changelog/_12855.txt b/.changelog/_12855.txt
new file mode 100644
index 0000000000..e8cfd87175
--- /dev/null
+++ b/.changelog/_12855.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+snapshot-agent: **(Enterprise only)** Fix a bug where providing the ACL token to the snapshot agent via a CLI or ENV variable without a license configured results in an error during license auto-retrieval.
+```
diff --git a/.gitignore b/.gitignore
index e67312cbe5..b9630db38b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ bin/
 changelog.tmp
 exit-code
 Thumbs.db
+.idea
 
 # MacOS
 .DS_Store