Development
master
Merging C2023-018 from development into master after successful testing.
code changes look good to proceed with testing.
No dependencies set.
The note is not visible to the blocked user.
Merging C2023-018 from development into master after successful testing.