diff --git a/changelog.d/17846.misc b/changelog.d/17846.misc
new file mode 100644
index 00000000000..6d1f930f10e
--- /dev/null
+++ b/changelog.d/17846.misc
@@ -0,0 +1 @@
+Update Alpine Linux Synapse Package Maintainer within installation.md.
diff --git a/changelog.d/17930.bugfix b/changelog.d/17930.bugfix
new file mode 100644
index 00000000000..2e37686857d
--- /dev/null
+++ b/changelog.d/17930.bugfix
@@ -0,0 +1 @@
+Fix bug when rejecting withdrew invite with a third_party_rules module, where the invite would be stuck for the client.
diff --git a/docs/setup/installation.md b/docs/setup/installation.md
index bfeacab3755..d0081a88d9b 100644
--- a/docs/setup/installation.md
+++ b/docs/setup/installation.md
@@ -157,7 +157,7 @@ sudo pip install py-bcrypt
 
 #### Alpine Linux
 
-6543 maintains [Synapse packages for Alpine Linux](https://pkgs.alpinelinux.org/packages?name=synapse&branch=edge) in the community repository. Install with:
+Jahway603 maintains [Synapse packages for Alpine Linux](https://pkgs.alpinelinux.org/packages?name=synapse&branch=edge) in the community repository. Install with:
 
 ```sh
 sudo apk add synapse
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py
index dd21a6136b1..0bca4c188bf 100644
--- a/synapse/events/snapshot.py
+++ b/synapse/events/snapshot.py
@@ -248,7 +248,7 @@ def state_group(self) -> Optional[int]:
     @tag_args
     async def get_current_state_ids(
         self, state_filter: Optional["StateFilter"] = None
-    ) -> Optional[StateMap[str]]:
+    ) -> StateMap[str]:
         """
         Gets the room state map, including this event - ie, the state in ``state_group``
 
@@ -256,13 +256,12 @@ async def get_current_state_ids(
         not make it into the room state. This method will raise an exception if
         ``rejected`` is set.
 
+        It is also an error to access this for an outlier event.
+
         Arg:
            state_filter: specifies the type of state event to fetch from DB, example: EventTypes.JoinRules
 
         Returns:
-            Returns None if state_group is None, which happens when the associated
-            event is an outlier.
-
             Maps a (type, state_key) to the event ID of the state event matching
             this tuple.
         """
@@ -300,7 +299,8 @@ async def get_prev_state_ids(
             this tuple.
         """
 
-        assert self.state_group_before_event is not None
+        if self.state_group_before_event is None:
+            return {}
         return await self._storage.state.get_state_ids_for_group(
             self.state_group_before_event, state_filter
         )