diff --git a/.all-contributorsrc b/.all-contributorsrc
index 9bb8ce01..a0ae5fc5 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -486,6 +486,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "ueman",
+      "name": "Jonas Uekötter",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1270149?v=4",
+      "profile": "https://uekoetter.dev/",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d5b700f..80738bcd 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,13 @@
 - Removed `URLProtectionSpace.iosIsProxy` property
 - `historyUrl` and `baseUrl` of `InAppWebViewInitialData` can be `null`
 
+## 5.4.4+4
+
+- Fixed missing `PullToRefreshController.isRefreshing` iOS implementation
+- Fixed Android `PullToRefreshController.setEnabled` at runtime
+- Fixed iOS `findNext`
+- Fixed Android `RendererPriorityPolicy.waivedWhenNotVisible` type 'Null' is not a subtype of type 'bool'
+
 ## 5.4.4+3
 
 - Removed Android unsafe trust manager
diff --git a/README.md b/README.md
index 42619367..23d5fac8 100755
--- a/README.md
+++ b/README.md
@@ -144,6 +144,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://xraph.com/"><img src="https://avatars.githubusercontent.com/u/11243590?v=4?s=100" width="100px;" alt="Rex Raphael"/><br /><sub><b>Rex Raphael</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=juicycleff" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/Sense545"><img src="https://avatars.githubusercontent.com/u/769406?v=4?s=100" width="100px;" alt="Jan Henrik Høiland"/><br /><sub><b>Jan Henrik Høiland</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=Sense545" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/igtm"><img src="https://avatars.githubusercontent.com/u/6331737?v=4?s=100" width="100px;" alt="Iguchi Tomokatsu"/><br /><sub><b>Iguchi Tomokatsu</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=igtm" title="Code">💻</a></td>
+      <td align="center"><a href="https://uekoetter.dev/"><img src="https://avatars.githubusercontent.com/u/1270149?v=4?s=100" width="100px;" alt="Jonas Uekötter"/><br /><sub><b>Jonas Uekötter</b></sub></a><br /><a href="https://github.com/pichillilorenzo/flutter_inappwebview/commits?author=ueman" title="Documentation">📖</a></td>
     </tr>
   </tbody>
   <tfoot>
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebView.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebView.java
index f8a6f1ce..881dc311 100755
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebView.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebView.java
@@ -376,10 +376,6 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
       setRendererPriorityPolicy(
               (int) customSettings.rendererPriorityPolicy.get("rendererRequestedPriority"),
               (boolean) customSettings.rendererPriorityPolicy.get("waivedWhenNotVisible"));
-    } else if ((customSettings.rendererPriorityPolicy == null || (customSettings.rendererPriorityPolicy != null && customSettings.rendererPriorityPolicy.isEmpty())) &&
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      customSettings.rendererPriorityPolicy.put("rendererRequestedPriority", getRendererRequestedPriority());
-      customSettings.rendererPriorityPolicy.put("waivedWhenNotVisible", getRendererPriorityWaivedWhenNotVisible());
     }
 
     if (WebViewFeature.isFeatureSupported(WebViewFeature.SUPPRESS_ERROR_PAGE)) {
@@ -1011,9 +1007,9 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
     if (newSettingsMap.get("networkAvailable") != null && customSettings.networkAvailable != newCustomSettings.networkAvailable)
       setNetworkAvailable(newCustomSettings.networkAvailable);
 
-    if (newSettingsMap.get("rendererPriorityPolicy") != null &&
+    if (newSettingsMap.get("rendererPriorityPolicy") != null && (customSettings.rendererPriorityPolicy == null ||
             (customSettings.rendererPriorityPolicy.get("rendererRequestedPriority") != newCustomSettings.rendererPriorityPolicy.get("rendererRequestedPriority") ||
-                    customSettings.rendererPriorityPolicy.get("waivedWhenNotVisible") != newCustomSettings.rendererPriorityPolicy.get("waivedWhenNotVisible")) &&
+                    customSettings.rendererPriorityPolicy.get("waivedWhenNotVisible") != newCustomSettings.rendererPriorityPolicy.get("waivedWhenNotVisible"))) &&
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       setRendererPriorityPolicy(
               (int) newCustomSettings.rendererPriorityPolicy.get("rendererRequestedPriority"),
diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewSettings.java b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewSettings.java
index 3f1a7c2a..d5290d6b 100755
--- a/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewSettings.java
+++ b/android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebViewSettings.java
@@ -100,7 +100,8 @@ public class InAppWebViewSettings implements ISettings<InAppWebViewInterface> {
   public Integer scrollBarDefaultDelayBeforeFade = null;
   public Boolean scrollbarFadingEnabled = true;
   public Integer scrollBarFadeDuration = null;
-  public Map<String, Object> rendererPriorityPolicy = new HashMap<>();
+  @Nullable
+  public Map<String, Object> rendererPriorityPolicy = null;
   public Boolean useShouldInterceptRequest = false;
   public Boolean useOnRenderProcessGone = false;
   public Boolean disableDefaultErrorPage = false;
diff --git a/pubspec.yaml b/pubspec.yaml
index 4c44afce..2e4717e0 100755
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,9 @@
 name: flutter_inappwebview
 description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window.
 version: 6.0.0-beta.1
-homepage: https://github.com/pichillilorenzo/flutter_inappwebview
+homepage: https://inappwebview.dev/
+repository: https://github.com/pichillilorenzo/flutter_inappwebview
+issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues
 
 environment:
   sdk: ">=2.14.0 <3.0.0"