diff --git a/.github/issue_template.md b/.github/issue_template.md
index 2806b29..e3fc4e5 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -2,86 +2,86 @@
 
   Thank you for reporting a bug for the Cmder project!
   ------------------------------------------------------------------
-  
+
   Please make sure you read and follow the following instructions
   carefully before reporting bugs, and/or requesting new features.
-  
+
   Make sure that you have:
-  
+
   • Searched for existing issues (including the **closed** ones)
     for the similar problems here:
-    
+
     https://github.com/cmderdev/cmder/issues?q=is:issue
-    
+
   • Read both the README.md and the Wiki:
-  
+
     - https://github.com/cmderdev/cmder/blob/master/README.md
     - https://github.com/cmderdev/cmder/wiki
-    
+
     (What you may be asking here could already be explained there!)
-    
+
   • Please understand that Cmder uses ConEmu as the default
     underlying Terminal Emulator.  If your issue is regarding
     the **Terminal Emulator**, please visit the ConEmu issues page:
-    
+
     https://github.com/Maximus5/ConEmu/issues?q=is:issue
-    
+
     If there isn't an existing issue, you may open a new one there.
-    
-    (We don't resolve issues regarding ConEmu here, so please 
+
+    (We don't resolve issues regarding ConEmu here, so please
      make sure you open the issue in the correct place.)
 
     more info: https://conemu.github.io/en/ThirdPartyProblems.html
-    
+
   • If you would like to ask for guides on how to integrate Cmder with
     your favorite IDE of choice, or how to perform a specific task
     with Cmder, make sure you visit our label section first.
-    
+
     You may already have an answer under the Guides or Questions section.
 
     For a list of labels, visit:
     - https://github.com/cmderdev/cmder/labels
 
     (Be sure to also check “Closed” issues in the labels section!)
-    
+
   • If you have a request to provide auto-complete support for a new tool,
     please post your request here:
-    
+
     https://github.com/vladimir-kotikov/clink-completions/issues
-    
+
   • If you are having an issue with any of the **upstream technologies**
     that are used by Cmder, please make sure that the issue is reproducible
     _only_ when used in combination with Cmder.
-    
+
     We may not directly address the issues related to the following tools:
        - Clink, the default shell in Cmder
        - ConEmu, the terminal emulator
        - Git/MinGW, which also provide *NIX tools
        - clink-completions, which provide autocompletion
-    
+
     The issues related to upstream technologies are labeled as 👆 [name].
-    
+
     We'll try our best to help you -- but we recommend creating an issue
     specifically at each of the corresponding repositories for the best
     result.
-    
+
     ► Try to reproduce the bug you're reporting, on a stand-alone edition
       of each tool, without using Cmder.  If the bug applies when the
       mentioned tools are NOT used within Cmder, there's a good chance that
       you should open the bug at the corresponding repo instead.
-     
+
   • Lastly, have a look at official documentation for Cmder over
     our website, and our wiki.
 
     Read more on about Cmder on ConEmu docs:
     https://conemu.github.io/en/cmder.html
-    
-    
+
+
   Thank you for making sure you are opening a new valid issue! ♥
-  
+
 -->
 
-<!-- 
+<!--
   Some tips on how to write a better report:
   - Put an `x` into all the boxes [ ] relevant to your issue (correct example: [x] -- not like this: [ x] or [x ]).
   - Use the *Preview* tab to see how your issue will actually look like, before sending it.
@@ -105,5 +105,5 @@
 
 <!-- If applicable, write down your Windows edition too (e.g. Windows 10 Pro 1809) -->
 
-### Description of the issue 
+### Description of the issue
 <!-- Provide a clear, simple description of your issue here -->
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bde41af..6f6ef29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@
   * Provide default settings for Clink that updates the history file in real time
     * Turn this on in existing Cmder using `clink set history_io 1`
   * Allow clink disable by setting CMDER_CLINK=0 before starting task
+* Pull Request: [#2068](https://github.com/cmderdev/cmder/pull/2068)
+  * Print Index in History Command Output.
+  * Sets default `history_expand_mode = 3` in initial Clink Settings.
 
 ### Adds
 
diff --git a/vendor/clink_settings.default b/vendor/clink_settings.default
index 021a78d..97420e2 100644
--- a/vendor/clink_settings.default
+++ b/vendor/clink_settings.default
@@ -87,7 +87,7 @@ history_io = 1
 # from the history. This can be enabled and disable by setting this value to 1
 # or 0. Values or 2, 3 or 4 will skip any ! character quoted in single, double,
 # or both quotes respectively.
-history_expand_mode = 4
+history_expand_mode = 3
 
 # name: Support Windows' Ctrl-Alt substitute for AltGr
 # type: bool
diff --git a/vendor/user_aliases.cmd.default b/vendor/user_aliases.cmd.default
index 03e4d01..4221684 100644
--- a/vendor/user_aliases.cmd.default
+++ b/vendor/user_aliases.cmd.default
@@ -9,7 +9,7 @@ gl=git log --oneline --all --graph --decorate  $*
 ls=ls --show-control-chars -F --color $*
 pwd=cd
 clear=cls
-history=cat "%CMDER_ROOT%\config\.history"
+history=cat -n "%CMDER_ROOT%\config\.history"
 unalias=alias /d $1
 vi=vim $*
 cmderr=cd /d "%CMDER_ROOT%"