Merging changes from Release 1.2 into development branch (Rel 1.4).
The note is not visible to the blocked user.