diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index e0ce003c25fa..993897ad68e3 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -1,2 +1,4 @@
 # Workflows
 001
+
+004
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index a2260b5c57b9..a4d760d2e1b5 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -16,9 +16,6 @@
 name: auto-merge HEAD to BASE
 
 on:
-  push:
-    branches:
-    - branch-0.2
   pull_request:
     branches:
     - branch-0.2
@@ -31,11 +28,11 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: auto-merge job
-        if: github.ref == 'refs/heads/branch-0.2' && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.merged == true))
+        if: github.event.pull_request.merged == true
         uses: ./.github/workflows/auto-merge
         env:
           OWNER: pxLi
           REPO_NAME: spark-rapids
           HEAD: branch-0.2
           BASE: branch-0.3
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          GITHUB_TOKEN: ${{ secrets.NVAUTO_TOKEN }}
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index d10bc4950d67..5be53a91b64c 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -30,10 +30,10 @@ jobs:
       - name: Update CHANGELOG.md
         id: upt
         #run: echo "::set-output name=stdout::$(.github/workflows/changelog/changelog --base_refs=branch-0.1,branch-0.2,branch-0.3)"
-        if: ${{ github.ref == 'refs/heads/branch-0.2' && github.event.pull_request.merged == true }}
+        if: github.event.pull_request.merged == true
         uses: ./.github/workflows/changelog
         env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
+          GITHUB_TOKEN: ${{ secrets.NVAUTO_TOKEN }}
 
       - name: Get date
         id: dt
@@ -41,19 +41,20 @@ jobs:
         run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
 
       - name: Create PR
-        if: ${{ github.ref == 'refs/heads/branch-0.2' && github.event.pull_request.merged == true }}
+        if: github.event.pull_request.merged == true
         uses: peter-evans/create-pull-request@v3
         with:
-          token: ${{ secrets.PAT }}
+          token: ${{ secrets.NVAUTO_TOKEN }}
           commit-message: "changelog-gen ${{ steps.dt.outputs.date }}"
-          committer: Peixin Li <pxli@nyu.edu>
-          author: Peixin Li <pxli@nyu.edu>
+          committer: nvauto <sw-gpu-spark-github-nvauto@nvidia.com>
+          author: nvauto <sw-gpu-spark-github-nvauto@nvidia.com>
           signoff: true
           branch: changelog-night-update
           title: '[DOC] Changelog update ${{ steps.dt.outputs.date }} [skip ci] [bot]'
           body: |
             changelog-gen runs on ${{ steps.dt.outputs.date }}
-            check script stdout: [job_${{ github.run_id }}](https://github.com/pxLi/spark-rapids/runs/${{ github.run_id }}?check_suite_focus=true#step:3:1)
+
+            check script stdout: [job_run_${{ github.run_id }}](https://github.com/pxLi/spark-rapids/actions/runs/${{ github.run_id }})
 
             Please review the generated CHANGELOG.md, then merge or close the PR and feel free to **delete** the remote branch.
           labels: |
diff --git a/.github/workflows/changelog/Dockerfile b/.github/workflows/changelog/Dockerfile
index 6a946346f7f9..01c66a087d54 100644
--- a/.github/workflows/changelog/Dockerfile
+++ b/.github/workflows/changelog/Dockerfile
@@ -16,7 +16,6 @@ FROM python:alpine
 
 WORKDIR /
 COPY changelog .
-COPY entrypoint.sh .
-RUN pip install requests && chmod +x /changelog /entrypoint.sh
+RUN pip install requests && chmod +x /changelog
 
-ENTRYPOINT ["/changelog", "--base_refs=branch-0.1,branch-0.2,branch-0.3"]
+ENTRYPOINT ["/changelog", "--base_refs=branch-0.2,branch-0.3,branch-0.1"]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ffe05927da0..958780476bf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # Change log
-Generated on 2020-08-24
+Generated on 2020-08-25
 
 ## Release 0.2
 
 ### Features
 |||
 |:---|:---|
+|[#515](https://github.com/NVIDIA/spark-rapids/issues/515)|[FEA] Write tests for AQE skewed join optimization|
 |[#452](https://github.com/NVIDIA/spark-rapids/issues/452)|[FEA] Update HashSortOptimizerSuite to work with AQE|
 |[#454](https://github.com/NVIDIA/spark-rapids/issues/454)|[FEA] Update GpuCoalesceBatchesSuite to work with AQE enabled|
 |[#566](https://github.com/NVIDIA/spark-rapids/issues/566)|[FEA] Add support for StringSplit with an array index.|
@@ -47,6 +48,7 @@ Generated on 2020-08-24
 ### Bugs Fixed
 |||
 |:---|:---|
+|[#598](https://github.com/NVIDIA/spark-rapids/issues/598)|[BUG] Non-deterministic output from MapOutputTracker.getStatistics() with AQE on GPU|
 |[#192](https://github.com/NVIDIA/spark-rapids/issues/192)|[BUG] test_read_merge_schema fails on Databricks|
 |[#569](https://github.com/NVIDIA/spark-rapids/issues/569)|[BUG] left_semi_join operation is abnormal and serious time-consuming|
 |[#341](https://github.com/NVIDIA/spark-rapids/issues/341)|[BUG] Document compression formats for readers/writers|
@@ -235,6 +237,7 @@ Generated on 2020-08-24
 ### Features
 |||
 |:---|:---|
+|[#74](https://github.com/NVIDIA/spark-rapids/issues/74)|[FEA] Support ToUnixTimestamp|
 |[#21](https://github.com/NVIDIA/spark-rapids/issues/21)|[FEA] NormalizeNansAndZeros|
 |[#105](https://github.com/NVIDIA/spark-rapids/issues/105)|[FEA] integration tests for equi-joins|
 ### Bugs Fixed