diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 878192966d9985334290241ec2a25ec08288cbf2..c64e5f78746b70d3ba9c0164310111c048df0527 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -7,9 +7,27 @@
 
 ### Enhancement
 
-1. Through Bugfix, the feature of encryption becomes much stable and applicable.
 1. Support using less-than character(<) and greater-than character(>) for sharding data.
 1. When master and slave dataSources exist, support executing `SELECT FOR UPDATE` on master dataSource.
+1. Support hint in Sharding-Proxy.
+1. Finish to parse DAL syntax for MySQL.
+1. Make configuration of orchestration compatible between Sharding-JDBC and Sharding-Proxy.
+
+### Bug Fixes
+
+1. Through Bug fix, the feature of encryption becomes much stable and applicable.
+1. Support delete statement with alias.
+1. Check and disable update sharding column.
+1. Fix wrong type of TINYINT and SMALLINT as INTEGER.
+
+### Refactor
+
+1. Rename optimized module to preprocessor module.
+1. Decouple rewrite core module and sharding/encrypt features.
+
+### Change Logs
+
+1. [MILESTONE](https://github.com/apache/incubator-shardingsphere/milestone/8)
 
 ## 4.0.0.RC2
 
diff --git a/sharding-distribution/shardingsphere-src-distribution/src/main/assembly/source-distribution.xml b/sharding-distribution/shardingsphere-src-distribution/src/main/assembly/source-distribution.xml
index 4f67f746daa8e241e82f8091d16d13545d018d88..8ede0977c97f4d238593fb3f7b76a6fe4b6786fe 100644
--- a/sharding-distribution/shardingsphere-src-distribution/src/main/assembly/source-distribution.xml
+++ b/sharding-distribution/shardingsphere-src-distribution/src/main/assembly/source-distribution.xml
@@ -51,6 +51,12 @@
                 <exclude>**/cobertura.ser</exclude>
                 <exclude>*.gpg</exclude>
                 
+                <!-- node ignore -->
+                <exclude>**/dist/**</exclude>
+                <exclude>**/node/**</exclude>
+                <exclude>**/node_modules/**</exclude>
+                <exclude>**/etc/**</exclude>
+                
                 <!-- eclipse ignore -->
                 <exclude>**/.settings/**</exclude>
                 <exclude>**/.project</exclude>
diff --git a/sharding-ui/sharding-ui-backend/src/main/java/org/apache/shardingsphere/ui/security/UserAuthenticationService.java b/sharding-ui/sharding-ui-backend/src/main/java/org/apache/shardingsphere/ui/security/UserAuthenticationService.java
index 8047c32f8c5bee7de894cde6ad4d9470d7b63f30..f35dc91194053ce91a60d693d5b7944995365cc8 100644
--- a/sharding-ui/sharding-ui-backend/src/main/java/org/apache/shardingsphere/ui/security/UserAuthenticationService.java
+++ b/sharding-ui/sharding-ui-backend/src/main/java/org/apache/shardingsphere/ui/security/UserAuthenticationService.java
@@ -41,9 +41,9 @@ public final class UserAuthenticationService {
     @Getter
     @Setter
     private String password;
-
-    final Base64 base64 = new Base64();
-
+    
+    private final Base64 base64 = new Base64();
+    
     private Gson gson = new Gson();
     
     /**
@@ -53,7 +53,7 @@ public final class UserAuthenticationService {
      * @return check success or failure
      */
     public boolean checkUser(final UserAccount userAccount) {
-        if (userAccount == null || Strings.isNullOrEmpty(userAccount.getUsername()) || Strings.isNullOrEmpty(userAccount.getPassword())) {
+        if (null == userAccount || Strings.isNullOrEmpty(userAccount.getUsername()) || Strings.isNullOrEmpty(userAccount.getPassword())) {
             return false;
         }
         return username.equals(userAccount.getUsername()) && password.equals(userAccount.getPassword());