Development
master
Merging into Development after successful code review
Tested and working as expected.
No dependencies set.
The note is not visible to the blocked user.
Tested and working as expected.