fix: imported fixes 06-11-26

Merged
JU
4mo ago
+883-87

Proposed changes (including videos or screenshots)

All approvals have already been given in the private fork.

Issue(s)

VLN-297, VLN-386, VLN-406, VLN-400

Steps to test or reproduce

N/A

Further comments

@coderabbitai ignore