diff --git a/.github/bin/smoke-test.sh b/.github/bin/smoke-test.sh
index dddd740..59e4b02 100755
--- a/.github/bin/smoke-test.sh
+++ b/.github/bin/smoke-test.sh
@@ -100,7 +100,7 @@
 declare -A KnownIssue
 
 #--- Opentitan
-KnownIssue[formatter:$BASE_TEST_DIR/opentitan/hw/ip/aes/dv/aes_model_dpi/aes_model_dpi_pkg.sv]=1006
+# Original issue - 1006 has been resolved
 # There is also bug 1008 which only shows up if compiled with asan
 
 #--- ivtest
diff --git a/.github/workflows/verible-ci.yml b/.github/workflows/verible-ci.yml
index e492643..a67f348 100644
--- a/.github/workflows/verible-ci.yml
+++ b/.github/workflows/verible-ci.yml
@@ -47,7 +47,7 @@
 
     - name: 📤 Upload performance graphs
       uses: actions/upload-artifact@v2
-      if: success() || failure() 
+      if: success() || failure()
       with:
         name: "diag"
         path: "**/plot_*.svg"
@@ -99,7 +99,7 @@
 
     - name: 📤 Upload performance graphs
       uses: actions/upload-artifact@v2
-      if: success() || failure() 
+      if: success() || failure()
       with:
         name: "diag"
         path: "**/plot_*.svg"
@@ -187,7 +187,7 @@
 
     - name: 📤 Upload performance graphs
       uses: actions/upload-artifact@v2
-      if: success() || failure() 
+      if: success() || failure()
       with:
         name: "diag"
         path: "**/plot_*.svg"
@@ -290,7 +290,7 @@
 
     - name: 📤 Upload performance graphs
       uses: actions/upload-artifact@v2
-      if: success() || failure() 
+      if: success() || failure()
       with:
         name: "diag"
         path: "**/plot_*.svg"
@@ -310,7 +310,7 @@
         format: 'YYYY-MM-DD-HH-mm-ss'
 
     - name: Mount bazel cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: "/private/var/tmp/_bazel_runner"
         key: bazelcache_macos_${{ steps.cache_timestamp.outputs.time }}
@@ -335,7 +335,7 @@
         format: 'YYYY-MM-DD-HH-mm-ss'
 
     - name: Mount bazel cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: "c:/users/runneradmin/_bazel_runneradmin"
         key: bazelcache_windows2_${{ steps.cache_timestamp.outputs.time }}
diff --git a/verilog/formatting/formatter_test.cc b/verilog/formatting/formatter_test.cc
index 8642878..f3c3773 100644
--- a/verilog/formatting/formatter_test.cc
+++ b/verilog/formatting/formatter_test.cc
@@ -4312,6 +4312,21 @@
      "    endfunction\n"
      "  endclass\n"
      "endpackage\n"},
+    {"package fedex;\n"
+     "  import \"asdf\" context function void bar(\n"
+     "    input bit              [2:1] aaaa,   // EOL COMMENT\n"
+     "                                          // another\n"
+     "    input bit foo\n"
+     "  );\n"
+     "endpackage\n",
+     "package fedex;\n"
+     "  import \"asdf\" context\n"
+     "      function void bar(\n"
+     "    input\n        bit [2:1] aaaa,  // EOL COMMENT\n"
+     "                         // another\n"
+     "    input bit foo\n"
+     "  );\n"
+     "endpackage\n"},
 
     // function test cases
     {"function f ;endfunction", "function f;\nendfunction\n"},
diff --git a/verilog/formatting/tree_unwrapper.cc b/verilog/formatting/tree_unwrapper.cc
index b7160a0..c8f6176 100644
--- a/verilog/formatting/tree_unwrapper.cc
+++ b/verilog/formatting/tree_unwrapper.cc
@@ -563,7 +563,7 @@
     case NodeEnum::kPortDeclarationList:
     case NodeEnum::kActualParameterByNameList:
     case NodeEnum::kPortActualList:
-    // case NodeEnum::kPortList:  // TODO(fangism): for task/function ports
+    case NodeEnum::kPortList:
     case NodeEnum::kModuleItemList:
     case NodeEnum::kGenerateItemList:
     case NodeEnum::kClassItems: