Merging changes from F2023-083 relating to UI from Development into Master.
The note is not visible to the blocked user.