Development
master
Merged development into master after successful testing.
Reviewed-on: looks good.
No dependencies set.
The note is not visible to the blocked user.
Merged development into master after successful testing.