fix: imported fixes 04-04-26

Merged
JU
6mo ago
+1061-157

Proposed changes (including videos or screenshots)

Approvals were provided in the private fork.

Issue(s)

https://rocketchat.atlassian.net/browse/VLN-308
https://rocketchat.atlassian.net/browse/VLN-316
https://rocketchat.atlassian.net/browse/VLN-319
https://rocketchat.atlassian.net/browse/VLN-320
https://rocketchat.atlassian.net/browse/VLN-318

Steps to test or reproduce

Further comments

@coderabbitai ignore