Push changes from master to staging on 2024-05-10

[cgolubi1]

This update brings these approved pulls to the staging branch:

• 2941

• 2942

• 2943

Database updates:

UPDATES=
SCRIPTS=

Once this pull is merged, i will load the changes on staging.buttonweavers.com as part of #2786.

[cgolubi1]

deployment is done.