The note is not visible to the blocked user.
Rebased.
rebased; please merge.
excess pit fixed; now fixing merge conflict