Development
master
Merging F2023-142 and B2022-046 in from development to master after successful testing.
Merged into Development after successful code review
format only change
No dependencies set.
The note is not visible to the blocked user.
Merging F2023-142 and B2022-046 in from development to master after successful testing.