[server 21.1] Various backports
This PR includes several backports for 21.1.2.
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
This PR includes several backports for 21.1.2.