Development
master
Merging B2023-091 and B2023-078 from development into master.
Merging B2023-078 into Development.
passed the code review
No dependencies set.
The note is not visible to the blocked user.
Merging B2023-091 and B2023-078 from development into master.