Merging F2023-139 from development into master after successful testing.
The note is not visible to the blocked user.