merge with new template and backporte translations from master
The note is not visible to the blocked user.