diff --git a/CHANGELOG.md b/CHANGELOG.md
index c13ca09c7d..539d4ad278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,59 @@
 # Change Log
 
+## [2.1.1](https://github.com/networknt/light-4j/tree/2.1.1) (2022-04-26)
+
+
+**Merged pull requests:**
+
+
+- fix for NPE if input is null for Mask methods (issue 1208) [\#1222](https://github.com/networknt/light-4j/pull/1222) ([miklish](https://github.com/miklish))
+- fixes \#1220 update the rate-limit config to ensure backward compatibi… [\#1221](https://github.com/networknt/light-4j/pull/1221) ([stevehu](https://github.com/stevehu))
+- fixes \#1216 add query parameter and header rewrite in the ProxyHandler [\#1217](https://github.com/networknt/light-4j/pull/1217) ([stevehu](https://github.com/stevehu))
+- fixes \#1218 handle the case that clientId and userId resolver failed … [\#1219](https://github.com/networknt/light-4j/pull/1219) ([stevehu](https://github.com/stevehu))
+- Issue1211 [\#1212](https://github.com/networknt/light-4j/pull/1212) ([stevehu](https://github.com/stevehu))
+- fixes \#1213 move the tableau authentication handler to the light-4j i… [\#1214](https://github.com/networknt/light-4j/pull/1214) ([stevehu](https://github.com/stevehu))
+- fixes \#1209 NPE is thrown when the server is selected as key without … [\#1210](https://github.com/networknt/light-4j/pull/1210) ([stevehu](https://github.com/stevehu))
+- fixes \#1206 update the default rate limit handle configuration after … [\#1207](https://github.com/networknt/light-4j/pull/1207) ([stevehu](https://github.com/stevehu))
+- fixes \#1204 update rate-limit to add an overloaded constructor with c… [\#1205](https://github.com/networknt/light-4j/pull/1205) ([stevehu](https://github.com/stevehu))
+- fixes \#1202 remove the 500 sleep and enable multiple requests test [\#1203](https://github.com/networknt/light-4j/pull/1203) ([stevehu](https://github.com/stevehu))
+- Rate limit handler fix [\#1201](https://github.com/networknt/light-4j/pull/1201) ([GavinChenYan](https://github.com/GavinChenYan))
+- Issue1178 [\#1200](https://github.com/networknt/light-4j/pull/1200) ([stevehu](https://github.com/stevehu))
+- fixes \#1198 return an status object for generic exception from the Pr… [\#1199](https://github.com/networknt/light-4j/pull/1199) ([stevehu](https://github.com/stevehu))
+- Feature/content length error message [\#1197](https://github.com/networknt/light-4j/pull/1197) ([KalevGonvick](https://github.com/KalevGonvick))
+- ProxyBodyHandler Rework [\#1196](https://github.com/networknt/light-4j/pull/1196) ([KalevGonvick](https://github.com/KalevGonvick))
+- add DefaultConfigLoaderTest.java [\#1192](https://github.com/networknt/light-4j/pull/1192) ([wswjwjccjlu](https://github.com/wswjwjccjlu))
+- fixes \#1191 We have ProxyHandler in both egress-router and ingress-pr… [\#1194](https://github.com/networknt/light-4j/pull/1194) ([stevehu](https://github.com/stevehu))
+- Issue1188 [\#1189](https://github.com/networknt/light-4j/pull/1189) ([stevehu](https://github.com/stevehu))
+- ProxyBodyHandler rework [\#1187](https://github.com/networknt/light-4j/pull/1187) ([KalevGonvick](https://github.com/KalevGonvick))
+- fixes \#1183 add the Transfer-Encoding of http header into the client.yml [\#1185](https://github.com/networknt/light-4j/pull/1185) ([stevehu](https://github.com/stevehu))
+- fixes \#1181 Update the config class to output the config file name wh… [\#1182](https://github.com/networknt/light-4j/pull/1182) ([stevehu](https://github.com/stevehu))
+- fixes \#1179 remove a trace statement that can cause NPE [\#1180](https://github.com/networknt/light-4j/pull/1180) ([stevehu](https://github.com/stevehu))
+- fixes \#1176 add a status code for OBJECT_NOT_UNIQUE [\#1177](https://github.com/networknt/light-4j/pull/1177) ([stevehu](https://github.com/stevehu))
+- fixes \#1174 [\#1175](https://github.com/networknt/light-4j/pull/1175) ([GavinChenYan](https://github.com/GavinChenYan))
+- fixes \#1172 output the status in log if get service from portal fails [\#1173](https://github.com/networknt/light-4j/pull/1173) ([stevehu](https://github.com/stevehu))
+- fixes \#1170 add enabled flag to the rule-loader.yml to bypass the rul… [\#1171](https://github.com/networknt/light-4j/pull/1171) ([stevehu](https://github.com/stevehu))
+- Update on config loader for nested values.yml [\#1168](https://github.com/networknt/light-4j/pull/1168) ([wswjwjccjlu](https://github.com/wswjwjccjlu))
+- fixes \#1166 Handle the LoadBalancingRouterProxyClient has empty host … [\#1167](https://github.com/networknt/light-4j/pull/1167) ([stevehu](https://github.com/stevehu))
+- fixes \#1126 update the config.yml and router.yml with templates [\#1165](https://github.com/networknt/light-4j/pull/1165) ([stevehu](https://github.com/stevehu))
+- fixes \#1162 Add a new error code for Startup Hook not loaded correctly [\#1163](https://github.com/networknt/light-4j/pull/1163) ([stevehu](https://github.com/stevehu))
+- fixes \#1160 Update a typo in a test case comment [\#1161](https://github.com/networknt/light-4j/pull/1161) ([stevehu](https://github.com/stevehu))
+- fixes \#1158 update default client.yml to enable the token serverUrl a… [\#1159](https://github.com/networknt/light-4j/pull/1159) ([stevehu](https://github.com/stevehu))
+- fixes \#1156 add more tracing statements in OauthHelper [\#1157](https://github.com/networknt/light-4j/pull/1157) ([stevehu](https://github.com/stevehu))
+- fixes \#1154 adding logging statements in AbstractRegistry [\#1155](https://github.com/networknt/light-4j/pull/1155) ([stevehu](https://github.com/stevehu))
+-  fix the empty body issue for config reload handler [\#1153](https://github.com/networknt/light-4j/pull/1153) ([GavinChenYan](https://github.com/GavinChenYan))
+- fixes \#1151 add a default constructor for ClientCredentialsRequest [\#1152](https://github.com/networknt/light-4j/pull/1152) ([stevehu](https://github.com/stevehu))
+- fixes \#1149 make the sanitizer.yml backward compatible [\#1150](https://github.com/networknt/light-4j/pull/1150) ([stevehu](https://github.com/stevehu))
+- fixes \#1147 remove the serviceId from the header in the router client [\#1148](https://github.com/networknt/light-4j/pull/1148) ([stevehu](https://github.com/stevehu))
+- fixes \#1140 Update client module to verify JWT tokens from many OAuth… [\#1146](https://github.com/networknt/light-4j/pull/1146) ([stevehu](https://github.com/stevehu))
+- Issue1139 [\#1145](https://github.com/networknt/light-4j/pull/1145) ([stevehu](https://github.com/stevehu))
+- Issue1143 [\#1144](https://github.com/networknt/light-4j/pull/1144) ([GavinChenYan](https://github.com/GavinChenYan))
+- fixes \#1141 update logging statements in OauthHelper and ProxyHandler [\#1142](https://github.com/networknt/light-4j/pull/1142) ([stevehu](https://github.com/stevehu))
+- fixes \#1137 update the rule-loader startup to avoid loading the same … [\#1138](https://github.com/networknt/light-4j/pull/1138) ([stevehu](https://github.com/stevehu))
+- fixes \#1135 add a new status code to indicate the access control rule… [\#1136](https://github.com/networknt/light-4j/pull/1136) ([stevehu](https://github.com/stevehu))
+- fixes \#1133 Add method rewrite in the gateway use case to support leg… [\#1134](https://github.com/networknt/light-4j/pull/1134) ([stevehu](https://github.com/stevehu))
+- fixes \#1131 update sanitizer handler to support all owasp encoders [\#1132](https://github.com/networknt/light-4j/pull/1132) ([stevehu](https://github.com/stevehu))
+- fixes \#1129 update RuleLoaderStartupHook to only get the ruleId and i… [\#1130](https://github.com/networknt/light-4j/pull/1130) ([stevehu](https://github.com/stevehu))
+- fixes \#1127 upgrade jaeger-client to 1.8.0 from 1.6.0 to resolve depe… [\#1128](https://github.com/networknt/light-4j/pull/1128) ([stevehu](https://github.com/stevehu))
 ## [2.1.0](https://github.com/networknt/light-4j/tree/2.1.0) (2022-02-27)