various-fixes
master
See individual commits for details.
No dependencies set.
The note is not visible to the blocked user.
See individual commits for details.