This includes rebased versions of changes originally introduced in PR #2558.
The note is not visible to the blocked user.