Merge dev into master (#1042)

* Weekly Permissions sync 2025-03-06

* Weekly Permissions sync 2025-03-07

---------

Co-authored-by: David <[email protected]>
Co-authored-by: Andrew Omondi <[email protected]>

Author: 3 people