Development
master
Merging B2023-097 and B2023-098 from development into master after successful testing.
format only changes
No dependencies set.
The note is not visible to the blocked user.
Merging B2023-097 and B2023-098 from development into master after successful testing.