Squashed to a single commit, ready to merge :)
Please note that blocking a user has other effects, such as: