Merge branch 'develop' into 'fix/oauth-compile-time'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index bb1f48a28f94fda841316ac1e85f1268a7d38002,3d578caefb0c17aa999468578816bcf121b1c8d9..d52ab341b82d9739aef42b6569055acdad1f1924
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -82,7 -82,7 +82,8 @@@ The format is based on [Keep a Changelo
  - Report emails now include functional links to profiles of remote user accounts
  - Not being able to log in to some third-party apps when logged in to MastoFE
  - MRF: `Delete` activities being exempt from MRF policies
 +- OTP releases: Not being able to configure OAuth expired token cleanup interval
+ - OTP releases: Not being able to configure HTML sanitization policy
  <details>
    <summary>API Changes</summary>